Merge "Convert apct/text/text_native_test-cloud-tf to Test Mapping Suite." am: e1e26b6c6e am: 5e700852bb am: 418bc7e7fa

Change-Id: Ib7fd2a3e338f4684b6cb0602f4deec89839147c3