am 5470c169: am 2b20efa7: Merge "Core/jni: Remove Dalvik options from AndroidRuntime"
automerge: 83cfb97

* commit '83cfb97323469e3370840c6cefb5689ab2059025':
  Core/jni: Remove Dalvik options from AndroidRuntime