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

Change-Id: I5506a16b74b49fe0ae1165bd1c866fc043022d77