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

Change-Id: I91978ad442e7b79a3c19819cffa322c30cc274c4