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

Change-Id: Iea0611f40d9a5fa4bf38d631a0b6565655af87d0