Merge commit 'affa5d2c0f7c2ade43ded5ff9a7952b269183117' into eclair-mr2-plus-aosp * commit 'affa5d2c0f7c2ade43ded5ff9a7952b269183117': remove unused jni interfaces
Merge commit 'affa5d2c0f7c2ade43ded5ff9a7952b269183117' into eclair-mr2-plus-aosp * commit 'affa5d2c0f7c2ade43ded5ff9a7952b269183117': remove unused jni interfaces