am 51cbf794: am 802ddd8a: am be11c2cf: Merge "Revert "Fix cts test LayoutTests#testSimpleRedLayout()"" into lmp-sprout-dev * commit '51cbf794': Revert "Fix cts test LayoutTests#testSimpleRedLayout()"