Merge "TEST_MAPPING += hidl_implementation_test" am: fac4d20499
am: 6177a1bf37

Change-Id: I2f731a2440d02b7f9f6ff74ffc2a06b6f4eb17d1