Merge "Fix lshal cannot be run without root"
am: 6481ebfbc3

Change-Id: Ic269ab86b933557ee171961f78d6e49e0d4df315