Catch up with some AOSP stuff.
Missed this in AOSP update stuff.
AOSP catch-up: 3rd time's a charm?

Conflicts:
	BoardConfig.mk