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

* commit '57dc6d9dce0bbafa442fda41f98da858b89c5059':
  limit mediaserver memory

Change-Id: Id57767343c25b32bf523ac1c5f421f2f38fb68ad