Merge remote-tracking branch 'cm/cm-11.0' into du44 and Merge tag 'AU_LINUX_ANDROID_KK_3.5.04.04.02.003.298' into du44

Change-Id: I2671700f5d96dfce0ef6a24c9d039dfd75202311