Merge "Add libphonenumber to layoutlib.jar. DO NOT MERGE" into klp-dev