Merge "Fix adb bugreport and add bugreport unit tests."
am: cb47a08e14

Change-Id: Ib4479db5628fcbd5624b8931715b0d02fdcc3e5e