Android: Bugfixes

Two quick fixes before the enormous L-compat changeset.