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

Change-Id: I7bd84b738b971947cace814d86205724bbd4360b