Merge "Clean up use of HAVE_ANDROID_OS"