Merge "Add libphonenumber to layoutlib.jar. [DO NOT MERGE]" into jb-mr2-dev