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

Change-Id: Ia752c42f894f98ea1fb67945fff972b03c890cbd