am 0c44762f: am 8152502e: (-s ours) am 07d5f94e: am 2eb5f9e5: Merge "Add libphonenumber to layoutlib.jar. [DO NOT MERGE]" into jb-mr2-dev

* commit '0c44762ffee58dbcd526ad173934e3ff48fb9ff9':
  Add libphonenumber to layoutlib.jar. [DO NOT MERGE]