Fix aapt warnings

Change-Id: I5fc6a83accf96fac7c5efc126c4dd49143b3b66a