Merge "Modify metadata-generate to produce AIDL files instead of HIDL." into tm-dev