Merge remote-tracking branch 'origin/test' into lp5.0

Conflicts:
	BoardConfigCommon.mk
	sepolicy/file_contexts