Merge "Use DeletableArenaObject for DexFileData" am: a4bf3c33e5
am: a87550f4b9

Change-Id: I03026bdb54adba38478e11313534bcbc4ac01f08