AOSP catch-up: 3rd time's a charm?

Conflicts:
	BoardConfig.mk