am 10fd7f6b: am ca2c6307: am 87be67f9: Fix layoutlib [DO NOT MERGE]

* commit '10fd7f6b4192fdbd847106fb0d9ec87095092ee3':
  Fix layoutlib [DO NOT MERGE]