Merge "Move removed.txt files to android-removed.txt"