Merge "should fix sdk build" into ics-mr1