Fix occurrences of "-Wextra-semi-stmt"

Docs-Preview: https://skia.org/?cl=173761
Reviewed-on: https://skia-review.googlesource.com/c/173761
Reviewed-by: Mike Klein <mtklein@google.com>
Commit-Queue: Brian Salomon <bsalomon@google.com>

This cherry-pick adapts to the current AOSP sources.  The upstream
change is already in internal branch with the following change-id.
Adding 'Merged-In' so Automerger doesn't try to apply this to the
internal branch.

Test: Build with new clang.
Merged-In: Ied2fc08712e6cadaa59e9c6f5a685c36916b6581

Change-Id: Id87f32a637444ea72095a6cde90b9012a4d10853
50 files changed