Merge "Fix errors caught by aapt2" am: ed90a673d4
am: 592590c3d2

Change-Id: I47bac881f38d638192418c4e664722cc71941f0d