Merge "Fix SDK build" into gingerbread