am 5e76e0ae: Merge "LayoutLib: Fix some rendering issues" into honeycomb

* commit '5e76e0aea28042287553ffa21826f59f601a3d2b':
  LayoutLib: Fix some rendering issues