am bfdbf085: am 73c936c8: Fix gradle dex error

* commit 'bfdbf08528513b5067badeef4fbdfd390425d483':
  Fix gradle dex error