Merge "Re-enable the zipping of bluetooth logs" into oc-dev am: cf2efe056b
am: a566e4b48e

Change-Id: I2ce50377dad4380492f96e6d808d8cad609b1ee2