am 90cf3eef: Merge "Clean up ScopedArenaAllocatorAdapter."

* commit '90cf3eefb4cd4dbd7ccd514738055b4d193981fe':
  Clean up ScopedArenaAllocatorAdapter.