Merge "Fix errors caught by aapt2"
am: 5d58a302e3

Change-Id: Icf8a601da34c92af6f82afbbdf87468db6387049