Fix merge derp

Change-Id: Iee37378c3eec4bed5b157459dbd6ad38a882d024
Merge commit '3fa8da5' into cm-10.2

Conflicts:
	drivers/staging/android/lowmemorykiller.c

Change-Id: I71c24c7250df4f0883bce995199fb719db81718a
Fix merge derp #2

Change-Id: I60e8e8054f70aa6b9003c6990cc861d55d84c265