After I tried some methods, I finally created a backup of the Android folder and then deleted the Android folder and rebuilt it again, problem solved and I moved changes back from android-copy to Android folder