am d867551e: am ffbe862d: Merge change I60b2633b into eclair

Merge commit 'd867551efea52a7d342b8fd2ed08fc9939090e88' into eclair-mr2-plus-aosp

* commit 'd867551efea52a7d342b8fd2ed08fc9939090e88':
  Add the JNI test to the CTS list.