Revert "Otapreopt: Work around bug 38186355"

This reverts commit 12375069e753adea6c123fca7706b1018d358c92.

Bug: 38186355
Bug: 38199123
Test: m
Test: manual OTA
1 file changed