align make files
Merge branch 'master' of https://github.com/spezi77/android_device_htc_bravo

Conflicts:
	BoardConfig.mk
	init.bravo.rc