Fix errors caught by aapt2
am: 23e371b933

Change-Id: I673f2b03d6ef64c1194d0d423c6d4a996287a275