Revert "Merge branch 'jb2' of github.com:CarbonDev/android into q"

This reverts commit c1f22afd3cbc65e34bfe458874f2e4e6fc24ccf0, reversing
changes made to a790bef6ff67848a1e3046e05189a1d3631e79fb.