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

Change-Id: If979c3857005d930cc52b27adc11bc51d77d5ee3