am 826bf9b6: Merge "media: parse max-concurrent-instances." into mnc-dev
am 826bf9b6: Merge "media: parse max-concurrent-instances." into mnc-dev

* commit '826bf9b63f69f4e19011f7f72b022b50b89fca49':
  media: parse max-concurrent-instances.

xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base