Merge "Fix errors caught by aapt2" am: 953fc3b4e7
am: 7792a13c96

Change-Id: I59775ba0c95d2093d34434e4c9fcc427cb43f779