This reverts commit da1bc79f. Reason for revert: Caused OOM in media process Bug: 112907825 Bug: 118593766 Change-Id: I545663871d75889b209b9fd2131cdaa97166478f