Merge "Remove framework-aidl-mappings"