Synced with 7a94c6905a.
7a94c6905a
It had been synced with style changes (spaces -> tabs), not sure why I accepted to merge it this way back then... Synced with eb57657f66, same as before. Custom-changes will be reapplied in the next commit, if relevant.
eb57657f66
-Added new Gradle build system, as it is the required build system