build: Fix some build deps and sequencing

Change-Id: I2160c3411c1e0760e5c602b71ba1ab3c81bc197f
2 files changed