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

* commit '6aa6872593d89f6390a366544c20d933c8513ec4':
  Lose HAVE_ANDROID_OS from frameworks/compile/libbcc.