am ece855c2: (-s ours) am 18afaca1: Merge "DO NOT MERGE. Fix crash in vold" into klp-dev

* commit 'ece855c21d5f21603edf7a67c56181502857b1df':
  DO NOT MERGE. Fix crash in vold