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

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