Merge "Add memory heap checks for mediaserver and audioserver" into nyc-dev
am: f3d9908a88

* commit 'f3d9908a888203e7e70b8c2d43ee741a95e154ed':
  Add memory heap checks for mediaserver and audioserver

Change-Id: I796467f1b5ef9b295f5ba738d3ac013349d0946b