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

Change-Id: I7392aaa76dafeec1f2df847d69de5fefcae96494