Merge "DO NOT MERGE limit mediaserver memory" into klp-dev am: f8429c0c am:...

Merge "DO NOT MERGE limit mediaserver memory" into klp-dev am: f8429c0c am: 38ab87c3 am: e816dcc0  -s ours am: cbe77616  -s ours am: 61a1371e am: 1094b530 am: 54403017  -s ours am: ad969657 am: c5774baa am: 9c0ffb14 am: d20ead84  -s ours am: 34f2112a am: 11c83929
am: bc2a67a1  -s ours

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

Change-Id: Ifa1656a46f7a3b26e050f9fa47029a2b1bd4431e