Make StackContainer test pass on Android.

base/stack_container_unittest.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/stack_container.h"
 
 #include <algorithm>
 
 #include "base/memory/aligned_memory.h"
 #include "base/memory/ref_counted.h"
@@ skipping 103 matching lines @@
 
 TEST(StackContainer, BufferAlignment) {
   StackVector<wchar_t, 16> text;
   text->push_back(L'A');
   EXPECT_ALIGNED(&text[0], ALIGNOF(wchar_t));
 
   StackVector<double, 1> doubles;
   doubles->push_back(0.0);
   EXPECT_ALIGNED(&doubles[0], ALIGNOF(double));
 
+  StackVector<AlignedData<16>, 1> aligned16;
+  aligned16->push_back(AlignedData<16>());
+  EXPECT_ALIGNED(&aligned16[0], 16);
+
+#if !defined(OS_ANDROID)
+  // It seems that android doesn't respect greater than 16 byte alignment for
+  // non-POD data on the stack, even though ALIGNOF(aligned256) == 256.
   StackVector<AlignedData<256>, 1> aligned256;
   aligned256->push_back(AlignedData<256>());
   EXPECT_ALIGNED(&aligned256[0], 256);
+#endif
 }
 
 #ifdef COMPILER_MSVC
 // Make sure all the class compiles correctly.
 // TODO(pinkerton): i'm not sure why this doesn't compile on GCC, but
 // it doesn't.
 template StackVector<int, 2>;
 template StackVector<scoped_refptr<Dummy>, 2>;
 #endif