am af60289e: am 70dfe865: Merge "Add missing files to fix libphonenumber for...
am af60289e: am 70dfe865: Merge "Add missing files to fix libphonenumber for layoutlib. [DO NOT MERGE]" into jb-mr2-dev
* commit 'af60289e':
Add missing files to fix libphonenumber for layoutlib. [DO NOT MERGE]