am c03530c1: am b20352f5: am 33f44937: 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 'c03530c18f1dd93bf052288d1d6ef80becff3f70':
  Fix NPE in layoutlib. [DO NOT MERGE]