am 599105a9: Merge "Fix NPE in layoutlib. DO NOT MERGE" into klp-dev

* commit '599105a92ceb24f0f09beb11be18126ae4e8efdf':
  Fix NPE in layoutlib. DO NOT MERGE