Merge "Convert apct/libnativehelper/native_test-cloud-tf to Test Mapping Suite." am: 7c50af6cd7 am: 3ba2fcc885
am: 2dd7439b70

Change-Id: Idd8dee9ff5cde2056d2ba537a9bbf94fc29c300d