Merge "Reduce calls to updateOomAdj() during unbind" into qt-dev am: 76236ec313
am: 3daf05e441

Change-Id: Icded700d7799c92024921bf860fa39e6d2738dc7