Merge "Add AdoptableHostTest and AdoptableFeatureConsistentTest to TEST_MAPPING"