fix conflicts with other devices

- i9500 and others

Change-Id: Ic58110bba477a9fcafc5402e050a84144175015d
Merge remote-tracking branch 'cm/cm-11.0' into HEAD