am 64dc0380: Fix layoutlib [DO NOT MERGE]

* commit '64dc0380127047ffcf135b6848c9150aa8dbed85':
  Fix layoutlib [DO NOT MERGE]