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

Change-Id: Ia3cb6a650437cea7df13d302d2f3b409e071e73a