Update Android SDK

Backward compability fixes.