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

Change-Id: I1903a47dd28c82bd13154da7aa353703dda258a0