Fixed aapt warnings

Change-Id: Id98196b04a2bf8d19c5df16876d75a22f80a2883