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

Change-Id: I7941cc0cb5cc7483791829a294224ec0c201f7c0