am 344d347a: am 39669d7f: am 6fdc6333: Merge "Lose HAVE_ANDROID_OS from frameworks/base."

* commit '344d347af22705aa2fa80602d27a5682a72b5f69':
  Lose HAVE_ANDROID_OS from frameworks/base.