am 434cd38f: Update layoutlib for jb mr1. do not merge.

* commit '434cd38f96a4a87220a8218901622f31e567354a':
  Update layoutlib for jb mr1. do not merge.