Updates for 11.0

Change-Id: I5adfaacbfd6eff42e4e861fcd67281421e230f86

Conflicts:
	BoardConfig.mk
selinux: Re-enable the device-specific policies

Change-Id: I59769775be803ae6f175e4195fdde14528694fdd