Merge "Add missing dependencies for libdexfile" am: 286aa939af
am: e78185076c

Change-Id: Icc5446f1ecfb88a292ac63058f7c4f44922e9a89