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

Change-Id: Ic50a19f45e76a1bb116b4c3b922e7b0fb7481117