Android: Fix build with latest SDK tools