Revert "Separate watch-application.h into wearable.h"