Carbon related changes

Change-Id: I8d939cb05fac910a274820c4a96fd741f537d8a0
Merge branch 'kk' of https://github.com/vishal-android-freak/device_semc_coconut into kk