am 9f6c3d60: Merge branch \'eclair-plus-aosp\' of...

am 9f6c3d60: Merge branch \'eclair-plus-aosp\' of ssh://android-git.corp.google.com:29418/platform/system/core into eclair-mr2-plus-aosp

Merge commit '9f6c3d60'

* commit '9f6c3d60':
  Force the mediaserver process to restart whenever the zygote or system