Merge "lshal: close fd before joining thread" am: 16b9f38d22 am: e13b6b62e6 am: 41e1544660
am: 9d6c8db4a0

Change-Id: I392b7ceed13d56986fc8a83230a715ae39116530