Automatically add a .zip to adb bugreport file when missing. am: 644a36c209
am: d4611a9680

* commit 'd4611a9680296d0053f7fa30ebc34d195a79c77a':

Change-Id: I7c6b9b62fb6467fc2a11c4a49eedf2d5b1355998