Merge "Convert apct/framework/ext_services_test-cloud-tf and apct/framework/testables_test-cloud-tf to Test Mapping Suite." am: 0b51af2540 am: 3f6177c54a
am: 1222d756d1

Change-Id: I8fea39a113bf11d3ad10ba4e249808a832ed9b1f