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

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