Merge "Add libbase dependency for bootctrl.avb" am: b82476b477 am: 13781b1cbf
am: 74418a587f

Change-Id: I3576b9bfc4bfbce7f3490a832ae08a946896d287