am 75f435b0: am 495c14d8: (-s ours) am 47ad22ed: am 961e3281: am 6df2860b: Add missing files to fix libphonenumber for layoutlib. [DO NOT MERGE]

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