Merge "limit mediaserver memory" into mnc-dev am: d64810330b am: 7b86b75190 am: daaece7f7c
am: 413afa2586  -s ours

* commit '413afa2586b2627a08a7d0c4954eef639727d0fa':
  limit mediaserver memory

Change-Id: Ic464684c026a3c772e4489f6af9801a2ee131f2f