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

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