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

Change-Id: I3fa8cad413879b7ee81591eaf2d4f6c1b0d9c9f4