homebrew
Merge branch 'jb3' of https://github.com/sspencer10/android_vendor_carbon into jb3

Conflicts:
	config/common.mk~