This reverts commit d116c603. Bug: 162595755 Test: unzip -l out/dist/android_system.jar | grep resources.arsc Change-Id: I1445bc742ea2f895291ffd80bdc0cf86e1b8878a