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

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