Merge "Revert "Switch from version script to APEX stubs for libdexfile_external and add it to the Runtime APEX.""
am: 0f41ed8a98

Change-Id: I36fc14f34ef30f5d1ea7bc49eba4b29708e50d27