Merge "Fix libdexfile dependencies to avoid direct dependency on libdexfile_external."
am: 21c29cfade

Change-Id: I1526f70910aa0ecd49d303bc848a3d08e4aa7a76