Update Viewer/Android build

Assorted build fixes, based on https://skia-review.googlesource.com/c/skia/+/653897

Bug: skia:14170
Change-Id: I3b762dea08e28d2647f08c095627db944b04a3b4
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/687996
Reviewed-by: Leon Scroggins <scroggo@google.com>
Commit-Queue: Florin Malita <fmalita@chromium.org>
4 files changed