Merge remote-tracking branch 'x86/kitkat-x86' into lollipop-x86

diff --cc Android.mk
Simple merge

diff --cc install/scripts/1-install
index 978b591,fd68e1c..e2b2e74
--- 1/install/scripts/1-install
--- 2/install/scripts/1-install
+++ b/install/scripts/1-install
@@@ -228,9 -261,10 +265,10 @@@ install_to(
        done
  
        fs=`cat /proc/mounts | grep /dev/$1 | awk '{ print $3 }'`
+       cmdline=`sed "s|\(initrd.*img\s*\)||; s|quiet\s*||; s|\(vga=\w\+\?\s*\)||; s|\(DPI=\w\+\?\s*\)||; s|\(INSTALL=\w\+\?\s*\)||; s|\(SRC=\S\+\?\s*\)||; s|\(DEBUG=\w\+\?\s*\)||; s|\(BOOT_IMAGE=\S\+\?\s*\)||" /proc/cmdline`
  
        asrc=android-$VER
 -      dialog --title " Confirm " --no-label Skip --defaultno --yesno \
 +      [ "$fs" != "ext4" ] && dialog --title " Confirm " --no-label Skip --defaultno --yesno \
                "\n Do you want to install boot loader GRUB?" 7 47
        if [ $? -eq 0 ]; then
                cp -af /grub /hd