Merge "Misc ordering of build rules." into idea133
automerge: b58beab

* commit 'b58beab69807171beeb040942af539c89e5558e8':
  Misc ordering of build rules.