Fix unused and deprecation warnings

Despite our best efforts to resolve warnings, some new ones slipped in
late this afternoon.

Change-Id: I4b8f8bba08de2d5c7a2a03c04d121c0e447bfa8e
Signed-off-by: Shawn O. Pearce <sop@google.com>
3 files changed