Merge "Core/jni: Remove Dalvik options from AndroidRuntime"