Merge "composer: AIDL HAL may replace HIDL HAL."