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

Change-Id: Ief054415f94a48aec923524ba34c6b8f546cb040