Merge "Support AHB in AIDL"