Merge "TEST_MAPPING += hidl_implementation_test"
am: 116e15fbaa

Change-Id: I0c5568e271ff7689edf4d59a219a02d4be4d2296