Merge "Move missed files to libdexfile"
am: d02784e17c

Change-Id: I9155bb616363f99db053d642fbd543610f96f547