More fixes-building now.

Change-Id: I29849bf5c820534ae02427356b7f9f903927633c