Merge branch 'two-fixes' into 'master'

Merge branch 'two-fixes' into 'master'

Two fixes

I pulled two commits out of !57 since it would be good to have them included, and specifically the `buildToolsVersion` issue was just discussed.

The current state of the `buildToolsVersion` replacement is not good.  It will replace this:

```
buildToolsVersion '21.0.1'
```

with this:

```
buildToolsVersion = '21.0.1'
```

That is incorrect, since the first form is more like a function call than a variable assignment.  So most likely that is causing the `buildToolsVersion` to be unset.  The commit here includes a fix that works for both the rare, non-standard variable assignment way, i.e. `buildToolsVersion = '21.0.1'` as well as the standard way: `buildToolsVersion '21.0.1'`.  It also includes tests for both cases.

See merge request !65