Merge "Revert "Revert "Copy resources from classes.jar when using AAPT2""" am: e2b98ace94
am: a4e638689b

Change-Id: I7d558d83c5cf6fcc251767299d0a98115b057b2f