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

* commit '1094b530ad2189ab879ef0bc20bae820b3d12c86':
  DO NOT MERGE limit mediaserver memory

Change-Id: I65c6ecb4787ab13560686b47b2cd970c54bd1118