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

* commit '76f9ec33f0e0ac80904b1cebe50b5d2bb3ccaf07':
  limit mediaserver memory

Change-Id: Ib771b5daec2ce2dd981193b1425002f8bc7db2e7