Revert "Merge branch 'HYBRID' of git://github.com/CarbonDev/android_vendor_carbon into jb2"

This reverts commit 3fc7e3f59bfc21512e164b5a34747102e14c3016, reversing
changes made to f401d3c425aee9473f311b39126a63b864916a4e.