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

diff --cc Android.mk
index f88578b,778029a..6015ded
--- 1/Android.mk
--- 2/Android.mk
+++ b/Android.mk
@@@ -88,11 -89,9 +88,11 @@@ $(ISO_IMAGE): $(boot_dir) $(BUILT_IMG
        $(hide) sed -i "s|\(Installation CD\)\(.*\)|\1 $(VER)|; s|CMDLINE|$(BOARD_KERNEL_CMDLINE)|" $</isolinux/isolinux.cfg
        $(hide) sed -i "s|VER|$(VER)|; s|CMDLINE|$(BOARD_KERNEL_CMDLINE)|" $</efi/boot/android.cfg
        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 \
 +      PATH="/sbin:/usr/sbin:/bin:/usr/bin"; \
 +      which xorriso > /dev/null 2>&1 && GENISOIMG="xorriso -as mkisofs" || GENISOIMG=genisoimage; \
 +      $$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) external/syslinux/bios/utils/isohybrid.pl $@
        @echo -e "\n\n$@ is built successfully.\n\n"