Build order modified to avoid missing dependency for the integration test.

Change-Id: I547706139516df4151c22ec09fe8a8d8974bc873