This reverts commit 41f46bef.

Bug: 124530765
Test: atest CtsGraphicsTestCases:android.graphics.cts.BitmapTest#testDrawingHardwareBitmapNotLeaking -- --abi x86
Change-Id: I39b2fe9cbb09ff10b529e5f745f25eebc96d8ad6