4.4.4_r1 -> 4.4.4_r2

Change-Id: I87be9ba59410a2bcc08cc277a40cc4ac0da48a7d
Merge branch 'cm-11.0' of https://github.com/CyanogenMod/android.git into 'cm-11.0'