Merge "TEST_MAPPING += hidl_implementation_test"
am: fac4d20499

Change-Id: I31de45d09ce5cc2e17a90c8adaad200f9d12e77f