Merge "Include /apex/com.android.runtime for native library in app classloader"