Fix merge mistake related to android/*/*.txt files