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

Change-Id: Ic92f75300d6cf4ac928c778730e843e62f674dfc