Merge commit '79451c85ae9a3532d2d52c5aadbfd707df415372' into remote

Conflicts:
	common/file_contexts
	common/hal_camera.te
	common/radio.te
	common/system_app.te

Change-Id: I32fc385e14582dd84feedd15e83074f0a1bbf6bf