Merge "Switch from version script to APEX stubs for libdexfile_external and add it to the Runtime APEX."
am: 9326ce87c4

Change-Id: I6dba809332bb5f4cba6ab7600e7c8a9185ae7b25