am 9c474738: Merge "Update layoutlib for jb mr1." into jb-mr1-dev

* commit '9c474738a29f77359a461035855d6e9b3935ade1':
  Update layoutlib for jb mr1.