am 86de59aa: am 741d6120: am 5c268763: Merge "Expose StaticLayout.Builder publicly" into mnc-dev

* commit '86de59aa33e109f237e9fc25a2bcf779dc753f0c':
  Expose StaticLayout.Builder publicly