am 096e4359: am f2f108fe: am a955314d: Merge "Add missing files to fix libphonenumber for layoutlib." into klp-dev

* commit '096e43590381b218cec88adeac4261427c19e139':
  Add missing files to fix libphonenumber for layoutlib.