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

* commit '38ab87c3e3cd4868958fcec4d1591ebc4a9e8d1a':
  DO NOT MERGE limit mediaserver memory

Change-Id: I053031830618e20ff830ae3c097abba10ae73cfc