This reverts commit cef1e80327. AND Fixing typo that fix a failure b/127312065 Test: atest CtsGraphicsTestCases:android.graphics.cts.BitmapFactoryTest#testDng -- --abi x86 Bug: 127312065 Change-Id: I96657adb54c33ceb92f25896bb5b6bdaa19e902c
cef1e80327