Merge "TEST_MAPPING += hidl_implementation_test" am: fac4d20499 am: 6177a1bf37 am: 4d6cb80110
am: bdf93811ce

Change-Id: I5bd5206701b903e47f26da87abc4874a8e0fe839