am 9c6f41e3: am be7b8f4f: Merge "aidl: Support building with updated host sysroot."
am 9c6f41e3: am be7b8f4f: Merge "aidl: Support building with updated host sysroot."

* commit '9c6f41e3eb2258d52480be04dd8916a10f8be8db':
  aidl: Support building with updated host sysroot.

xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base