Merge "Update layoutlib for jb mr1." into jb-mr1-dev