Merge "TEST_MAPPING += hidl_implementation_test"