We would get configure errors on first build/

Change-Id: I26bdbc5de262360bced617933c82bcaa4c3b0172