am 64b3de29: (-s ours) am 434cd38f: Update layoutlib for jb mr1. do not merge.

* commit '64b3de296cdbc8c02e2890f8853409c6d49cddb1':
  Update layoutlib for jb mr1. do not merge.