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