Merge "Add linker_set_key to RecordTypeDiff and EnumTypeDiff" am: cc90871286

Original change: https://android-review.googlesource.com/c/platform/development/+/2218448

Change-Id: I8623206b3d79d6710340e94ed39a62fbcccc4fef
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>