am 5b950250: (-s ours) am ea04da7a: am 9570ed56: Merge "Add libphonenumber to layoutlib.jar. DO NOT MERGE" into klp-dev

* commit '5b95025059f0925ad8d11bf503eb2acb4cc63228':
  Add libphonenumber to layoutlib.jar. DO NOT MERGE