Merge "TEST_MAPPING += hidl_implementation_test" am: 5dd2b18ac9
am: a067fa03f1

Change-Id: Ie1cc01e4efdc045cbd4c5de3c341ad9ce784bb7a