am 4edc7483: am bd17c3b4: Merge "Use a different block order when not compiling baseline."

* commit '4edc7483b9520e2d840e4754d19c0f0a8a235f56':
  Use a different block order when not compiling baseline.