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