Merge "Add ability to include messages in oom reports." into oc-mr1-dev am: 6243c21bd2
am: 8634031b3c  -s ours

Change-Id: Iff9ffb9307e4fc0e4cdca0f13b08b882b4a12805