am ea04da7a: am 9570ed56: Merge "Add libphonenumber to layoutlib.jar. DO NOT MERGE" into klp-dev

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