Java resources in core-tests are auto-merged to the apks now.

Finally we can remove the build hack.
Bug: 6892294
Change-Id: I424093f6f603c4b63fe5a7fcd957ca5dcd348930
9 files changed