Merge "Change AIDL module name"