Merge "Dumpstate: lshal runs in non-root in user build"