Android: Fix build with latest Android SDK build-tools