Merge "Use lshal's new --debug option when emitting bugreports." into oc-dev am: 91cfa880a3
am: cada705736

Change-Id: I0b0a3fab511d84b2402a6bd31d9d321e954f6921