e4735d77f1
This reverts commit 4c7d7d6749.
Reason for revert: New Test assets were getting pulled into the release APK, making the APK size growth too much. I will re-upload when I figure out how to avoid this.
Change-Id: I738eb6c26632eeee30be4098d0225836d283b218