Merge "Work around build break in layoutlib." into jb-dev