Merge "dumpstate: Remove FWDUMP_bcmdhd support" am: 86388dbc9a
am: 2d71f97dfb

Change-Id: I1e3a7ae0e7855a8003f463586d368a81ad89be5f