Merge "Add libbase dependency for recovery_test/boot_control_copy" am: a284424d6c am: 1e253ff82c am: 0ed8b439b3
am: 18eb429cfe

Change-Id: I19270e554296b967fa6193711a2f86d4fa565fe3