Merge "The aidl changes necessary to add requested AHB format enums"