am ffbe862d: Merge change I60b2633b into eclair

Merge commit 'ffbe862d05cb69278a26fb41950a2ce313451f49' into eclair-plus-aosp

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