am 81f1e754: am fd581059: am 88a12f57: (-s ours) am 43034b54: am 62591cff: am 689c0dfe: Fix NPE in layoutlib. [DO NOT MERGE]

* commit '81f1e7543c7426983d47f69f7a9f95fd69cdf2c1':
  Fix NPE in layoutlib. [DO NOT MERGE]