tree fa9f38b4aa9e750373bbc945657cf36a856c16b0
parent 276be051066bc453d22d3e0b947bb96a7d99fa08
author Mike Klein <mtklein@chromium.org> 1484339265 -0500
committer Skia Commit-Bot <skia-commit-bot@chromium.org> 1484342225 +0000

Fix Android roll

    - only depend on cpu-features when we know we have an NDK
    - disable SkSplicer

Change-Id: I89e4cc70d6ddf0ebb7005d1cb453768d946cd205
Reviewed-on: https://skia-review.googlesource.com/7060
Reviewed-by: Derek Sollenberger <djsollen@google.com>
Commit-Queue: Mike Klein <mtklein@chromium.org>