Fix for the new SDK structure

With the update of the SDK Tools 22 things got broken. 
This fixes it