Merge "Remove Support Library from SDK build"