Fix for per-app android targets