Updated Android version. Applied patches #2, #3 by Thorsten1976.