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

* commit '4c3549a27f7e90db09838e90ebab62816e09daf7':
  Fix layoutlib [DO NOT MERGE]