oom-kill: backports

Change-Id: Ic01ff276c17e1756d0e4bb242ce24d6753b99fae