Fix more build errors

Woohoo fun... I thought i just cleaned this file up???
Signed-off-by: Rashed Abdel-Tawab <rashedabdeltawab@gmail.com>

Change-Id: I643143812bd5bb56fe95329caceac4cac438f2ec