Merge latest version of lowmemorykiller

Conflicts:
	drivers/staging/android/lowmemorykiller.c