Merge "Fix errors caught by aapt2"
am: 6d78fe0385

Change-Id: Ie8e1374011a8494842efcae6881239d2f3728c3a