am 2eb5f9e5: Merge "Add libphonenumber to layoutlib.jar. [DO NOT MERGE]" into jb-mr2-dev

* commit '2eb5f9e5b25dc769e5ba205237097c67fa212fd6':
  Add libphonenumber to layoutlib.jar. [DO NOT MERGE]