Merge "bionic_tests_zipalign: don't explicitly specify no prefix/suffix." am: 235ccfd19b am: 36f53ef0eb
am: d4452aef52

Change-Id: I867eb7ded6cd9b17d92a3d3b49e779406c5454f0