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

Change-Id: Ic0a2468aa0318bfa8a3777653c37c49b3ab6aa5d