Merge "limit mediaserver memory" into lmp-dev am: 41e0a503e6 am: 76f9ec33f0 am: 57dc6d9dce
am: 4e61b921f0  -s ours

* commit '4e61b921f04c068e88a7ab8561a6e054900f527e':
  limit mediaserver memory

Change-Id: Ia358ad4caab8fc20b1b3040207ac9798895f3ad2