Fix aapt string warnings

Change-Id: Ia478a22938175546895a7b3230eefcbb8f96b2c8