Merge "Fix errors caught by aapt2"
am: ce4abe56b9

Change-Id: I1acf4f7e8384cc6005ffd1997d39cdccee5c8dc0