Merge "Convert apct/text/text_native_test-cloud-tf to Test Mapping Suite." am: 02fb19b968 am: a1bbe17ee5

Change-Id: If37fdd47d250e49c35fe3dbda0fc97ec86434c7e