Linaro Fixes - Allow for 4.7 building