Merge "ObjPtr<>-ify array allocations." am: 9ddef18ae9
am: da745da72f

Change-Id: Ie8b275d860053a9cf3aa7decd2dd8313e88a781a