am b6588c52: Merge "Fix NPE in layoutlib. [DO NOT MERGE]" into jb-mr2-dev

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