am 82c9b06a: am 6aa68725: Merge "Lose HAVE_ANDROID_OS from frameworks/compile/libbcc."

* commit '82c9b06a394b66abedd473ed562dd5b9ec57db48':
  Lose HAVE_ANDROID_OS from frameworks/compile/libbcc.