Merge "Add hashes for AIDL APIs"