Merge "Fix Wimax-less build." into ics-mr1