Merge "lshal: close fd before joining thread" am: 16b9f38d22
am: e13b6b62e6

Change-Id: Ica5713f0a6d1bb0dcbcfae5e446649a80e31714a