Merge "Add boot@1.1 to VNDK" am: 5ff715d088 am: f44a1e6c67
am: d4976a85ed

Change-Id: Ib60ac6e2359829efbaf78e90ab10d6b03d7f2f73