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

Change-Id: I8bb21edc60bc8df3e89cfd766584e2cafaf12a38