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

Change-Id: Ie05144f6b4f99cab13b59c47dd3f6c5d3599a1d4