Merge "Prepare to move ArtDexFileLoader to libdexfile"