Merge "aidl: Support building with updated host sysroot."