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

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