Merge "s/hidl_/hal_/ for hidl_implementation_test" am: d1fa583382 am: 9690dd559c

Change-Id: I169a22ceb03c93bfc8d5c73b0c5d06b1136c58c8