Fix errors caught by aapt2 am: 23e371b933
am: c2d31d04c9

Change-Id: I5a06dce4e17be8187910fca68db5d4221323ac23