Carbon 2.0

Change-Id: Ib3438d620c752c0bd3d6892113bbd5b617ecea31
Merge branch 'jb3' of git://github.com/angrydino/android_vendor_carbon into jb3