Temporarily revert ag/735253 until b/22902898 can be resolved with a proper DMAgent prebuilt drop. This reverts commit e7ed827a. Bug: 22902898