am cd677a30: Merge "Remove hard-coded number of audio channels in AudioSource" into gingerbread

Merge commit 'cd677a30851e4ba8b79a41c20e20220a81719378' into gingerbread-plus-aosp

* commit 'cd677a30851e4ba8b79a41c20e20220a81719378':
  Remove hard-coded number of audio channels in AudioSource