build fixes

Change-Id: Ibb963ec206a5ee64886d26bf2bab61d215583440