Merge "lmkd: Fix kill failure handling" am: 46bc39ba23 am: d13cfdcfa5
am: 5917fa18aa

Change-Id: Ib10a607c62d78107541f42723e5946910839b5f7