am 7c9f8005: Merge "Fix Wimax-less build." into ics-mr1

* commit '7c9f8005e20af0bb741e36d8239f301371ba5f7f':
  Fix Wimax-less build.