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

* commit '689c0dfe72a57c0555560012cbc6806375e7d4b7':
  Fix NPE in layoutlib. [DO NOT MERGE]