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

Change-Id: I4c479425f4ba8bdf69316058e7a14b83267779fb