Merge "Fix bcm4329 FW dump in bugreport for user-debug build"