[rbp] Fix non-square pixel display apect ratio and 3D TAB modes correctly
fixed, force rtmpX to the videodefaultplayer
fix typo from 66e5d70a (#elsif -> #elif)
[AE/CA] - hold the enginelock when diddleing with the hal during garbagecollect and reuse the resume() function instead of duplicating code
Merge pull request #2095 from davilla/restorertmp

fixed, force rtmpX to the videodefaultplayer
[droid] bump librtmp from 2.3 to 2.4
Merge pull request #2041 from popcornmix/display_aspect_ratio

[rbp] Fix non-square pixel display apect ratio and 3D TAB modes correctly
[rbp] removed useless file from 1f8d72560c2e1fb3705462ba151b83723c170e3d
Merge remote-tracking branch 'origin/master' into android-tegra2-xaf-touch