Linaro 4.8 changes
Signed-off-by: Kristofer Ard <kristoferard@gmail.com>