Revert^4 "Handle OOM situation in java-heap more aggressively"

This reverts commit 685c84775f7dfe23197b080e4730435fd80e6d27.

Reason for revert: Retrying with some changes in the failing art-tests

Change-Id: I2b03f17da74c11adba8a27b8e9488bfae3374085
1 file changed