Merge "Remove TEST_MAPPING for header-abi-checker" am: 4ea092ebee am: 834931a14e
am: e69a9d68cd

Change-Id: I130d465131449d914227903a41387dadb9153417