Fix build for c99

Fix two implicit declarations to allow clang building.

Change-Id: I934e7d455b22e55e0572ccd40f351ec5b50acb4d
Merge "Fix build for c99"
am 6435abb2: Merge "Fix build for c99"

* commit '6435abb2c5883ceb85598a9c690ea8f744df6b5f':
  Fix build for c99
Merge branch 'master' into vanir