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

Change-Id: I8af4025bb1fe7812bf294ffdcd083e60e76a5884