Merge "s/hidl_/hal_/ for hidl_implementation_test" am: 3e185aac17 am: f4139d9d88

Change-Id: I5ed3177801f0811891ec832450fa350a7d57ab5b