Merge branch 'master' into 'master'

Make ndk15+ happy

See merge request !512

mace/kernels/transpose.h

@@ -73,7 +73,8 @@ static void TransposeNCHWToNHWCC2(const float *input,
     for (w = 0; w + 3 < width; w += 4) {
       float32x4_t vi0 = vld1q_f32(input + in_offset);
       float32x4_t vi1 = vld1q_f32(input + in_offset + image_size);
-      vst2q_f32(output + out_offset, {vi0, vi1});
+      float32x4x2_t vi = {vi0, vi1};
+      vst2q_f32(output + out_offset, vi);
 
       in_offset += 4;
       out_offset += 8;

mace/ops/conv_2d_benchmark.cc

@@ -168,7 +168,6 @@ BM_CONV_2D(1, 1024, 7, 7, 1, 1, 1, 1, SAME, 1024);
 BM_CONV_2D(64, 32, 34, 34, 3, 3, 1, 1, VALID, 32);
 BM_CONV_2D(1, 32, 34, 34, 3, 3, 1, 1, VALID, 32);
 
-// bokeh
 BM_CONV_2D(1, 32, 256, 256, 1, 15, 1, 1, SAME, 2);
 BM_CONV_2D(1, 32, 256, 256, 15, 1, 1, 1, SAME, 2);
 BM_CONV_2D(1, 64, 64, 64, 15, 1, 1, 1, SAME, 2);