Merge "bionic_tests_zipalign: don't explicitly specify no prefix/suffix."