Merge remote-tracking branch 'x86/nougat-x86' into oreo-x86

author Chih-Wei Huang <cwhuang@linux.org.tw>

Thu, 22 Feb 2018 09:42:45 +0000 (17:42 +0800)

committer Chih-Wei Huang <cwhuang@linux.org.tw>

Thu, 22 Feb 2018 09:42:45 +0000 (17:42 +0800)
author Chih-Wei Huang <cwhuang@linux.org.tw>
Thu, 22 Feb 2018 09:42:45 +0000 (17:42 +0800)
committer Chih-Wei Huang <cwhuang@linux.org.tw>
Thu, 22 Feb 2018 09:42:45 +0000 (17:42 +0800)
diff --cc Android.mk
Simple merge
diff --cc initrd/init
Simple merge
author	Chih-Wei Huang <cwhuang@linux.org.tw>
	Thu, 22 Feb 2018 09:42:45 +0000 (17:42 +0800)
committer	Chih-Wei Huang <cwhuang@linux.org.tw>
	Thu, 22 Feb 2018 09:42:45 +0000 (17:42 +0800)
		1	2
Android.mk	patch \|	diff1 \|	diff2 \|	blob \| history
initrd/init	patch \|	diff1 \|	diff2 \|	blob \| history