Include both the 32 and 64 bit versions into test APK. Bug: 62588850 Bug: 34128677 Change-Id: I86c3b8ecad6bc6c1c81806ce42649ba0d2ee6c7c (cherry picked from commit 0b29b072)