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

* commit '8bc5b5b6022494e07c7668cd3229ddf553c3bf79':
  Fix layoutlib [DO NOT MERGE]