cleanup some overrides
Merge remote-tracking branch 'aospal/remix-legacy' into remix-legacy

Conflicts:
	configs/psd_overrides.mk