am 99ee6d83: Merge "Revert "Add allocator field to ClassLoader.""

* commit '99ee6d838ae8550eba8f1009b13b2273470c2448':
  Revert "Add allocator field to ClassLoader."