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

* commit '5e42147af3a8f284f9caa329c9fbfc994ca1d0da':
  Update layoutlib for jb mr1. do not merge.