Merge "adb: fix bugreport status line." am: f225aa3f24 am: cf4f2c9439

Change-Id: I2585a1ff18dff168c67456232d18ee90f0bd0df4