Merge "Codec 2.0 HIDL interfaces"