Merge "limit mediaserver memory" into mnc-dev am: d64810330b
am: 7b86b75190

* commit '7b86b7519019ad27274a6069309db33ed05772fc':
  limit mediaserver memory

Change-Id: I8d072ef7e56d2940f172e6f2cfab8d39fdf4eda2