[21.2] Remove useless files
[US21.2] Better have the files here then linking files that might change between Android versions.
[US21.2] Wrongly modified file