am 62591cff: am 689c0dfe: Fix NPE in layoutlib. [DO NOT MERGE]

* commit '62591cffc758b2c77028e4b80d61086c135ef54b':
  Fix NPE in layoutlib. [DO NOT MERGE]