am ed6d63d0: am d2868b8d: am e0b71b4e: Merge "media: clean up the usage of max-supported-instances." into mnc-dev
am ed6d63d0: am d2868b8d: am e0b71b4e: Merge "media: clean up the usage of max-supported-instances." into mnc-dev

* commit 'ed6d63d02802758efb2d4c49a606d65ea35d572e':
  media: clean up the usage of max-supported-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