Merge "Revert "Remove Support Library from SDK build" to fix build"