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

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