Merge "Rules depend on DEX2OATD, not DEX2OATD_DEPENDENCY."