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

Change-Id: Idf3f97ce70354bc135f9423d245efce9f1b9631b