Merge "Add boot@1.1 to VNDK"