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

Change-Id: I28b834066d2cf4fe4efb6abc54d492c699572782