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

Change-Id: Ia2a83c7db5a937f891d28c346e009145ff2d6ea7