Merge "Revert "Rename libdexfile_external_static to libdexfile_static.""