Merge "Add TEST_MAPPING that runs recovery_host_test."