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

Change-Id: I654c277f58c17b3fea77a401556ff1649bb428e4