bravo: build fixes

Change-Id: If7f2760228f6b750e677d24992cc17b46cdc4510

Conflicts:

	overlay/frameworks/base/core/res/res/values/config.xml