Merge "DO NOT MERGE limit mediaserver memory" into klp-dev am: f8429c0c14 am: 38ab87c3e3
am: e816dcc0b3  -s ours

* commit 'e816dcc0b3ea6d5cee3b0b4ff230a20ab85b5996':
  DO NOT MERGE limit mediaserver memory

Change-Id: Ia2bb13dbcbe30984d86c1a625ded2db5ddbbca2d