Branches/rudder/android support 2.5

Various fixes & improvements for Android