Merge "HwBinderTest: convert to JUnit4" am: 84755d06fc am: 407338f733
am: 764fbbbd3c

Change-Id: If955bec7d339dc3bc3019fec049b3013ca90a897