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

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

In recent merge from 1.3.1 to 1.3.2 branch a mistake was made
that affected five android related txt files. This change
restores those files to content before the merge.

Components: Vulkan

VK-GL-CTS issue: 4228

Removed tests:
dEQP-VK.*

Change-Id: I51cb8a3869883621edd8e3af4c2863adfd8739ba