Fix compiling issues of "make perf_test" under hip-tests. Change-Id: Ib03328a2fb13375fa44626a42202b1eeb177b8b2
Change-Id: If72e312461a72920b6a482009c9aef4cf92f2e1b
Change-Id: I68cb780a71a6094dca86718e7d427806d3a0e67d