ANDROID: Third try at configure changes.