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

Conflicts:
	Android.mk

diff --cc Android.mk
index bac13f2,56d9c3f..778029a
--- 1/Android.mk
--- 2/Android.mk
+++ b/Android.mk
@@@ -91,8 -91,8 +91,8 @@@ $(ISO_IMAGE): $(boot_dir) $(BUILT_IMG
        sed -i "s|OS_TITLE|$(if $(RELEASE_OS_TITLE),$(RELEASE_OS_TITLE),Android-x86)|" $</isolinux/isolinux.cfg $</efi/boot/android.cfg
        $(GENISOIMG) -vJURT -b isolinux/isolinux.bin -c isolinux/boot.cat \
                -no-emul-boot -boot-load-size 4 -boot-info-table -eltorito-alt-boot -e boot/grub/efi.img -no-emul-boot \
-               -input-charset utf-8 -V "$(if $(RELEASE_OS_TITLE),$(RELEASE_OS_TITLE),Android-x86) LiveCD" -o $@ $^
+               -input-charset utf-8 -V "$(if $(RELEASE_OS_TITLE),$(RELEASE_OS_TITLE),Android-x86) $(VER) ($(TARGET_ARCH))" -o $@ $^
 -      $(hide) isohybrid --uefi $@ || echo -e "isohybrid not found.\nInstall syslinux 4.0 or higher if you want to build a usb bootable iso."
 +      $(hide) external/syslinux/bios/utils/isohybrid.pl $@
        @echo -e "\n\n$@ is built successfully.\n\n"
  
  rpm: $(wildcard $(LOCAL_PATH)/rpm/*) $(BUILT_IMG)