Merge tilapia 4.3 into slim

Conflicts:
	full_tilapia.mk
	proprietary-blobs.txt

Change-Id: Ieea88107ee7be8db4e03a826085c4fce6a36108b