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

Change-Id: I8f8a014446f9d3079a4e78d2010bbd9b4e3f69af