Merge "limit mediaserver memory" into lmp-dev am: 41e0a503e6 am: 76f9ec33f0 am: 57dc6d9dce am: 4e61b921f0  -s ours am: 8fd39c4420 am: 19db724cf7 am: 6d44675bb4
am: 3d5d8388ba

* commit '3d5d8388ba21a2d03316ca1f9d071670fc71822f':
  limit mediaserver memory

Change-Id: Ic1ad65c156bf8c541ff30f3cfc6d6a3bc5c83e2f