am 8e6d75af: Merge "Fix 5473038: workaround for fd leak in lockscreen" into ics-mr0

* commit '8e6d75affa1a802b01aa38ad765d1ae9f998c0ab':
  Fix 5473038: workaround for fd leak in lockscreen