Fix the Android build with the new directory structure