Merge "Fix errors caught by aapt2" am: 953fc3b4e7 Change-Id: I42c4083ccf762580d4c19aaf4cfdc8e4bd947163