Revert "few fixes for linaro 4.7.3"

This reverts commit e74414a7ef4e4c403b88d0e261da11697262eab9.
Revert "fix linaro 4.7.3"

This reverts commit 0db0f7a66912eae2e26cd66c7dc7933251ace740.