build fixes

Change-Id: Id296cb9b1e696870aad7b3390f359c14e8cd2f66