Fix to comply with 0.10+ android gradle plugin.
Merge commit '44a1e74d01afd31ae1b78e6d85d1ab992295bb82' into dev