Merge "Revert "Make the JIT the default in ART."" am: 3b0ec01718
am: 22c13e1205

* commit '22c13e1205af06724725f182bd737a9cac4118da':
  Revert "Make the JIT the default in ART."