Merge "CTS: Add CTS JNI TEST_MAPPING" am: 6036cd14b0
am: a557e63b38

Change-Id: I4c02cbdb911e92e4bde3b17501943235e261e3cf