Merge "Add dependency on libdexfile for static libraries." am: 9c7e0b641e
am: cffa2405f2

Change-Id: I0c858eaede75df02da9e806d2de2b6a26f5b9d85