Merge "Fix libdexfile dependencies to avoid direct dependency on libdexfile_external." am: c65e54940b
am: 653e8b4615

Change-Id: Ia99308c3494e39b7a4bf05d14c0efa1f9c85133e