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: cc5a5f45
am: 2f97503d  -s ours

* commit '2f97503d':

Change-Id: I8a9e6cd6b0c5a23bade205cca0089c48bd492f02