patches from Corinna for android.