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

Change-Id: If6e862c0ac3066086b62ff773e9ac127477b83aa