Merge "Move missed files to libdexfile"