Merge "Add TEST_MAPPING that runs recovery_host_test."
am: 42bbda4909

Change-Id: Ifcef1200e1224dfc171fe152e8b5e1b2eb6723ba