Merge "Fix errors caught by aapt2"
am: ed90a673d4

Change-Id: I91c38a3b05338d280d4b5050f28f8f3c1f2481a2