Merge "Add target for generating aidl mappings"