am 789f7ada: am 27f0cf0b: (-s ours) am 10fd7f6b: am ca2c6307: am 87be67f9: Fix layoutlib [DO NOT MERGE]

* commit '789f7ada71ba7c3c228027d26f4c24d8ee420d0c':
  Fix layoutlib [DO NOT MERGE]