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

* commit 'ce71a8583e8105e99770a76c318e9688a603d253':
  limit mediaserver memory

Change-Id: I96bbaffa38bf02e526231f92b284e97e947564b7