Merge "limit mediaserver memory" into lmp-dev
am: 41e0a503e6

* commit '41e0a503e6f0c124208a7b9a8fa7321656359407':
  limit mediaserver memory

Change-Id: I95f77a8d40bd8e7fcd5a0dfae71d29809a3e62cc