Fix AAPT warnings

Change-Id: Id791b867bdd0cb07681fa626274480c6316ed061