Merge change from github.com:CyanogenMod/android_system_core.git

Signed-off-by: sndnvaps <sndnvaps@gmail.com>