Merge "shell.te: hwbinder for lshal" am: ee2faadcad
am: 6832909b4f

Change-Id: I0acd257b35f55e9f125ea805b2152aa1296ffa88