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

Change-Id: Id641a75d67d456d5ed67d9f19f6b3dc1a4f4f374