Merge changes I799508fa,I4951cca2

* changes:
  Don't attempt to dump vold on user builds.
  Include extra HALs in dump state