Merge "Add libbase dependency for recovery_test/boot_control_copy"
am: a284424d6c

Change-Id: I3470638860da74d9811459fdb65ea58d52fd6013