Merge "Separate AIDL packages"