Fix build errors(Linaro 14.10)

Signed-off-by: Vaibhav Bhasin <bhasinvaibhav97@gmail.com>