4.4.2_r1 -> 4.4.2_r2

Change-Id: I88d21c3cfd138dd8d5b23c23b5d294c138663850
Fixed conflict
Merge branch 'cm-11.0-jcrom' of github.com:JCROM-Android/cm_android into cm-11.0-jcrom