Revert of My take on SkAlign changes.

tests/MathTest.cpp

 /*
  * Copyright 2011 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "float.h"
 
 #include "SkColorPriv.h"
@@ skipping 661 matching lines @@
     test_divmod<int16_t>(r);
 }
 
 DEF_TEST(divmod_s32, r) {
     test_divmod<int32_t>(r);
 }
 
 DEF_TEST(divmod_s64, r) {
     test_divmod<int64_t>(r);
 }
-
-DEF_TEST(SkAlign, r) {
-    int x = 6;
-    REPORTER_ASSERT(r,  SkIsAlign2(x));
-    REPORTER_ASSERT(r, !SkIsAlign4(x));
-    x = SkAlign4(x);
-    REPORTER_ASSERT(r,  SkIsAlign2(x));
-    REPORTER_ASSERT(r,  SkIsAlign4(x));
-
-    auto p = (char*)&x;
-    REPORTER_ASSERT(r,  SkIsAlign2(p));
-    REPORTER_ASSERT(r,  SkIsAlign4(p));
-    p += 2;
-    REPORTER_ASSERT(r,  SkIsAlign2(p));
-    REPORTER_ASSERT(r, !SkIsAlign4(p));
-    p = SkAlign4(p);
-    REPORTER_ASSERT(r, p == (char*)(&x+1));
-}