Merge "Make "adb bugreport"'s .zip check case-insensitive." am: da6fe65000 am: 02ee1725ae
am: 76a62ca7c0

Change-Id: I84daa10e37c166a348261ea50f652b2ef0e46083