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

Change-Id: I5ddfd0167ac42dc2de4aabec1e39c5586dea7923