CHG: [droid] wraps native activity in a java class
Fix code generate problem with binary string.
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
FIX: eol
Merge pull request #2427 from koying/fixeol

FIX: eol
Merge remote-tracking branch 'origin/master' into android-tegra2-xaf-touch

Conflicts:
	tools/android/packaging/xbmc/src/org/xbmc/xbmc/Splash.java