am 82ec2f07: am 484e2c2d: Merge "Revert "Rules depend on DEX2OATD, not DEX2OATD_DEPENDENCY.""

* commit '82ec2f0790eb59a7ed71490d503a9b7cdef25ce4':
  Revert "Rules depend on DEX2OATD, not DEX2OATD_DEPENDENCY."