AE: ALSA: Try to get 200ms buffer even if we did not get 50ms periodsize
AE: ALSA: Try to get a minimum of 4 periods per buffer
CHG: [droid] wraps native activity in a java class
Fix CPipeFile::Write return value, the internal Write return bool, we need int.
Fix the GUI_MSG_WINDOW_DEINIT message to include the next window id as param
Merge pull request #2418 from ulion/add_missed_next_win_id_param_for_deinit_gui_message

Fix the GUI_MSG_WINDOW_DEINIT message to include the next window id as param1
[AE/CA/iOS] - don't set max frames per slice on the output unit before enabling input/output. Else enabling input/output fails on atv2 leading to fatal error on AE::StartEngine (and therefore crash back to frontrow)
Merge pull request #2416 from ulion/fix_pipefile_write_ret_val

Fix CPipeFile::Write return value, the internal Write return bool, we need int
Fix code generate problem with binary string.
[IOS] fix ios5+ crash, last fix for this has wrong order code during merge.
Merge pull request #2424 from ulion/fix_ios_image_crash_bad_merged_code

[IOS] fix ios5+ crash, last fix in 2411 has wrong code during merge.
Add deps to typemap files for code generate makefile.
[cec] removed dupe methods. if we really need that Sleep(), do it in CPeripherals instead
[cec] removed no longer used TranslateComPort()
[cec] cosmetics. made some methods private that don't need to be public
[cec] extra guards around m_queryThread
[cec] and let's init m_queryThread to NULL so we won't crash on exit when CEC has been disabled
Merge pull request #2425 from ulion/fix_code_generate_python_binary_string

Fix code generate python binary string
Merge pull request #2407 from koying/chgmainjava

CHG: [droid] wraps native activity in a java class
[cec] fixed compilation without libcec-dev on the system after 95d87f545665674f76f691197bbad3360b807981.
updated the method names of the dummy CPeripheralCecAdapter implementation so they match the ones in the real implementation