am ee527cbc: am ff248435: Merge "Fix cts test LayoutTests#testSimpleRedLayout()" into lmp-sprout-dev

* commit 'ee527cbcdb180dbf81e5c718d93a6119a815215a':
  Fix cts test LayoutTests#testSimpleRedLayout()