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

Change-Id: Ic27fa5b2e660b231250413f29d70a77801e8e99c