Merge "TEST_MAPPING += hidl_implementation_test" am: 5dd2b18ac9 am: a067fa03f1 am: 9413911a41
am: 668eba18ba

Change-Id: I10ee861bac01a4ba37226586599731fdb84e1255