[automerger skipped] Merge "Re-enable link type checking" am: 49efd2aa am:...

[automerger skipped] Merge "Re-enable link type checking" am: 49efd2aa am: d8c09803 -s ours am: f664429d -s ours am: 5c2b2d10 -s ours

am skip reason: Change-Id I293b3be5ca7828c9d7148e13d88b0f0bba54d964 with SHA-1 09e57929 is in history

Original change: https://android-review.googlesource.com/c/platform/build/+/1156840

Change-Id: I8085167f43fab8e0b4a0793e728eaff69ebdb519