am 6f1fda90: am 51d9652d: Merge "Revert "Fix media server restart detection mechanism"" into klp-dev
am 6f1fda90: am 51d9652d: Merge "Revert "Fix media server restart detection mechanism"" into klp-dev

* commit '6f1fda90a9beace9b90a6bee5f3fe4a3d4dcdb52':
  Revert "Fix media server restart detection mechanism"

xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base