Merge "CTS: Add CTS JNI TEST_MAPPING"