am 961e3281: am 6df2860b: Add missing files to fix libphonenumber for layoutlib. [DO NOT MERGE]

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