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