fix #1638 better build errors

fix #1638 - must be tested with:
https://github.com/wordpress-mobile/WordPress-Android-Libraries-Gradle-Plugin/pull/3