Merge "crash_dump: fix warnings, turn on -Werror." am: c5933ed960
am: 8412dac88c

Change-Id: I4a5e2a720e5e2f0a17fbf0891372fcd880c13af3