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

Change-Id: Icde98a98d4d2dbeeab8ea058dd5168c510494eaf