Fix deprecation warnings (now errors in 0.14.4) w/ gradle.
Merge "Fix deprecation warnings (now errors in 0.14.4) w/ gradle."
Merge remote-tracking branch 'upstream/master'