Merge "Include oom_adjust reason in trace" into qt-dev
am: 0ba84f8f24

Change-Id: Iadda6bf4ed89fe0e40fdcedcded0b57f8fd4a730