fix conflicts with other devices

- i9500 and others

Change-Id: Ic58110bba477a9fcafc5402e050a84144175015d
carbon.dependencies : update for kernel path

Change-Id: I935e92188cdc7607176f09872899a3c697f42660