am 87be67f9: Fix layoutlib [DO NOT MERGE]

* commit '87be67f91719234cbd381ff0242b5efc8b6aa257':
  Fix layoutlib [DO NOT MERGE]