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

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