am 5c268763: Merge "Expose StaticLayout.Builder publicly" into mnc-dev

* commit '5c268763049dd56a0e18c1652a671a1ad20978dd':
  Expose StaticLayout.Builder publicly