Merge "Remove obsolete BUILD_TINY_ANDROID check from healthd makefile"