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

* commit '43034b541cecd924b4b79a5caff850a53516ec26':
  Fix NPE in layoutlib. [DO NOT MERGE]