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

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