Merge "Skip JNI Tests for None CPU ABI" into honeycomb-mr1