Merge "Optimize layout rendering in layoutlib [DO NOT MERGE]" into jb-mr2-dev