Merge "Include /apex/com.android.runtime for native library in app classloader"
am: 9de24de618

Change-Id: I9bcc87b6866695689d31abf7e8e2066158857aba