Snap: Fix aapt warnings

Change-Id: I6d48105f0407ded104244eb5ace4a3ace76eb402
61 files changed