Just use original foldername and replace contents with linaro

Change-Id: I6fd1e3525840cfb57cff42ce851aa60b158d4cb0