Revert "Remove SkPaintOptionsAndroid"

gyp/tests.gypi

 # Common gypi for unit tests.
 {
   'include_dirs': [
     '../src/core',
     '../src/effects',
     '../src/image',
     '../src/lazy',
     '../src/images',
     '../src/pathops',
     '../src/pdf',
@@ skipping 28 matching lines @@
         '-ldl',
       ],
     }],
   ],
   'sources': [
     '../tests/Test.cpp',
     '../tests/Test.h',
 
     '../tests/AAClipTest.cpp',
     '../tests/ARGBImageEncoderTest.cpp',
+    '../tests/AndroidPaintTest.cpp',
     '../tests/AnnotationTest.cpp',
     '../tests/AsADashTest.cpp',
     '../tests/AtomicTest.cpp',
     '../tests/BBoxHierarchyTest.cpp',
     '../tests/BitSetTest.cpp',
     '../tests/BitmapCopyTest.cpp',
     '../tests/BitmapGetColorTest.cpp',
     '../tests/BitmapHasherTest.cpp',
     '../tests/BitmapHeapTest.cpp',
     '../tests/BitmapTest.cpp',
@@ skipping 154 matching lines @@
     '../src/utils/debugger/SkObjectParser.h',
     '../src/utils/debugger/SkObjectParser.cpp',
 
     '../tests/PipeTest.cpp',
     '../src/pipe/utils/SamplePipeControllers.cpp',
 
     '../tests/TDStackNesterTest.cpp',
     '../experimental/PdfViewer/src/SkTDStackNester.h',
   ],
 }