am e18ae130: am 0bb7ec7e: am d8b890da: (-s ours) am af60289e: am 70dfe865: Merge "Add missing files to fix libphonenumber for layoutlib. [DO NOT MERGE]" into jb-mr2-dev

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