Merge pull request #17 from padenot/android-headers

Mozilla Bug 850770: Import a modified version of an Android header
Fix cubeb/sndio (#851149)
Merge pull request #18 from landryb/master

sndio: Fix compile error after switchable-backends work.
rename sles_definitions.h.
rename sles_definitions.h (build fix).
opensl: bring back OpenSLES_Android.h, we need it.
opensl: fix warning caused by type of bufferqueue_callback.
Mozilla bug 852966 - Free audio buffers when freeing stream in opensl cubeb backend, r=kinetik
Mozilla bug 853077 - Don't queue empty buffers in the opensles cubeb backend, r=kinetik
Merge pull request #19 from michaelwu/fixes

opensl: buffer handling fixes.
Mozilla Bug 859805 - Make libcubeb work on Android (2.3)

Add the correct mangled symbol for getMinFrameCount, and use the old (Froyo)
channel layout enum when running on Gingerbread (2.3).