am d683d56c: (-s ours) am 35a94df7: am ea18b2d6: am 95fd97aa: (-s ours) am 84e7a6b8: am 443372dd: am 9d7b5165: Add libphonenumber to layoutlib.jar. [DO NOT MERGE]

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