Catch up with some AOSP stuff.

Conflicts:
	sepolicy/file_contexts