Merge upstream changes and fix gradle files