Merge "dumpstate: don't attempt to use vril-dump, it breaks adb bugreport"