Android: 3.5 bugfixes

First set of bugfixes for 3.5.