Merge "Prepare to move ArtDexFileLoader to libdexfile"
am: 933d6e72ed

Change-Id: I828e02e6a6bcbfd2ec781fe36cff899f400560b2