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

* commit '88a12f5744846511e1861cf0f2e311f642109012':
  Fix NPE in layoutlib. [DO NOT MERGE]