Bring in line with Hashcode's board setup commit

Also don't build hwcomposer on stock as it glitches
video waiting for vsync

Conflicts:

	device.mk