Merge "Use the right class loader allocator in ReallocMethods." am: 19ab59dae5
am: e893df8c06

Change-Id: I433013a738d34d92657442918e7b68da1a7a4ab9