Merge "Lose HAVE_ANDROID_OS in frameworks/rs."