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