Merge "grub.cfg: set serialno for boot_fat.uefi.img" am: b8a1917aee am: 3315bcdaf1 am: 7b519e663f
am: 9c5f2535d8

Change-Id: I9b5670f01b9883038863e1322967790a1f98a2e8