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

* commit 'af60289e692b6b598d550371cc6e41e0b40dd6cd':
  Add missing files to fix libphonenumber for layoutlib. [DO NOT MERGE]