Merge changes Ibb30bb90,I15bff10d

* changes:
  dumpstate: Only attempt screencap with do_fb
  dumpstate: Remove dump_anrd_trace()