Merge "Fix logging in libsuspend" am: ac4f4721a0 am: 492fb091d8
am: 720bdaf28d

Change-Id: I545ef80fb1870cc177fa30036b1f4691527282d6