SQUASH into android packaging change
Merge pull request #16 from Montellese/audio_encoders_newapi

win32 integration