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

Change-Id: Id28d82b8d88e0cc096d4e2a398b61d016633c4f0