Merge "dumpsys: use std::c* instead of TextOutput" am: b4401d18d8 am: 5d1678950b am: 1a1208a68a

Change-Id: If064b7e57d7036b346c002a65e709d31b6cad72a