Merge remote-tracking branch 'refs/remotes/android-x86/nougat-x86'

Conflicts:
	CleanSpec.mk
	core/binary.mk
	core/build_id.mk
	core/main.mk
	core/tasks/vendor_module_check.mk
	core/version_defaults.mk
	tools/releasetools/ota_from_target_files.py