While reviewing another fix, I noticed several places in build.gradle that use the following anti-pattern:

if (A)
    B;

This is not an acceptable coding style and can lead to bugs. The target statement(s) of multi-line conditional statements like this must be surrounded by curly braces or moved onto the same line as the conditional.