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

Change-Id: Ie2be24c89c3179b870fa0b8199886bb04b5db630