Merge "SDK only: now that support lib is in SDK, we can link to it." into ics-mr1