Fixes for building on v4.0

Signed-off-by: Mike Marchetti <mmarchetti@sandvine.com>
Change-Id: I3f24280ee0cc745a512e8879990f2dfa86d0feda
3 files changed