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

* commit 'd64810330ba81c6eb9a17e9fcc67b05ab4c29560':
  limit mediaserver memory

Change-Id: I7a3e76e929fe6ddb1613b5956f218048cd9b707c