build: Fixing a couple of warnings from clang 5.1 (clang-503.0.38)

Change-Id: I0689253f8d2e39eac1a54ae10428b97bdd689578