Remove duplicate resource definitions

Bug:29462255
Change-Id: I4face025cb060dd85b61587fe7c2f9807b3a7127
84 files changed