Merge "Fix missing textservices dump in 'adb bugreport'"