Merge "Lose HAVE_ANDROID_OS from frameworks/base."