Merge "DumpUtils: Teleophony will use a local copy instead." am: ae112af81d am: 7959de2021

Change-Id: I42842bfd4afbb096c992cc384de08b76db62974c