Bring back PA Hybrid settings!

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

This reverts commit 4ad334fb83ba4e0e4b217fbbad99f16e71fe4479.