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

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