Changes to allow compiling with linaro 4.7

Change-Id: Ic153c43a56f2da78c16f99cde2fdf05805c158a5