Jus a lil fixup...

Ask me about this in IRC
back to the oldschool
Revert "back to the oldschool"

This reverts commit 89ae0613722f8f74ecd48a07ff456602f57952df.
Merge branch 'jb2' of git://github.com/CarbonDev/android_vendor_carbon into jb2