Minor cleanup to go along with matching vhal update am: da2acb9ee8
am: b3dfb516fb

Change-Id: Ibe459a47e4bdb77b8469fddc88c6a81b0160de26