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

Change-Id: Ib9f3e19d2ca2552f8ef78f14a6c282c3b857d819