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

* commit 'ca2c6307263b3857ba688c80277fef402215db18':
  Fix layoutlib [DO NOT MERGE]