am e85d798b: (-s ours) am a4a1e68f: am ebdedb47: (-s ours) am 42994097: am a1be8b43: LayoutLib: Update golden test images. [DO NOT MERGE]

* commit 'e85d798b4a8574c7302644ccd911ccd7dcf53faf':