Modifications necessary for AOSP build

Conflicts:
	property.te