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

Change-Id: I249627820aabdabc3e0d06c82450efe8830934bc