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

Change-Id: I69003995256fa664e05c6e8748b3104dad205a13