Merge "Add missing dependencies for libdexfile"