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