(cherry picked from commit 95b1275197)
95b1275197
-Added new Gradle build system, as it is the required build system