Merge "Attempt to fix the SDK build" into gingerbread