am f75cf7de: am cdd185b8: Merge "Rules depend on DEX2OATD, not DEX2OATD_DEPENDENCY."

* commit 'f75cf7debc30335981772c77f74edf3e7180500d':
  Rules depend on DEX2OATD, not DEX2OATD_DEPENDENCY.