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

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