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

* commit 'daaece7f7c9ba4a5b8c743fc72e603ae04e38e4f':
  limit mediaserver memory

Change-Id: I106fc818f817212a551ee0cb95ecbd73a566effe