Fix up code warning and errors

Discovered by new LLVM rebase.

Clean up, no functionality change.

Test: build
Bug: 37752547
Change-Id: I7df6097706e0772226dcb07611e7d044a6085421
5 files changed