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

Change-Id: I12938842a12b014c328a9d368ec164a41be55a49