Conflicts:
	proprietary-blobs.txt
	setup-makefiles.sh
Update prop lists