Fix build break and warnings

Signed-off-by: Jassi Brar <jaswinder.singh@linaro.org>
3 files changed