Updated build files for gradle/support lib updates