Merge "Temporarily disable run-test 004-JniTest on javac-dx configurations."