Merge "Distinguish the various pre-allocated OutOfMemoryError use cases."
am: 72247af039

Change-Id: Id6ad5621b3767ef447ab8546765ad30a2b944a0b