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

* commit '27f0cf0b135917b52fea14406e806b35e721949e':
  Fix layoutlib [DO NOT MERGE]