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

Change-Id: Ia0f6d76e1dd2e78c4fbde3804db44f3794a922fb