This reverts commit 89de4443. Reason for revert: Seemingly breaks imgdiag_test on device. Change-Id: I46084ecb4205575381aafffd90a0f1a1126e8d2d Test: mmma art