Merge "CTS: Add Compilation test-mapping" am: 4319984705
am: d482d6b85b

Change-Id: Ie08ba046937d1630a365f84bc99d38016fd46ac9