am cc22e394: Merge "Align CodeInfo regions instead of their inner subregions."

* commit 'cc22e3946baf035c8732e9417ab132bfe663aa45':
  Align CodeInfo regions instead of their inner subregions.