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

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

Change-Id: Ia88648ff82be88a90c98ded3061a6f04db74c03b