Merge "Merge "limit mediaserver memory" into lmp-dev am: 41e0a503 am:...

Merge "Merge "limit mediaserver memory" into lmp-dev am: 41e0a503 am: 76f9ec33 am: 57dc6d9d am: 4e61b921  -s ours am: 8fd39c44 am: 19db724c am: 6d44675b am: 3d5d8388 am: d4b80363 am: c7fc3e21" into nyc-mr1-dev-plus-aosp
am: 587fc682

* commit '587fc682':

Change-Id: I446cd607880d134f2d4afd9cedad6d204631741e