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

Change-Id: I43703b6403f7dd6fcffac551f6eb2153263170db