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

* commit '42453ede3335aa5f7007a5b36749e84df83a08d4':
  Fix NPE in layoutlib. DO NOT MERGE