Merge "AudioFlinger: Get shared heap size from property" am: 844fab9b2b
am: c29470f61a

* commit 'c29470f61a5f35f23c8f52851e778b6613ace6f8':
  AudioFlinger: Get shared heap size from property