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

* commit '4bd720c2c63b2400437db971ac96616693a8fe3b':
  aidl: Support building with updated host sysroot.