31a2d063df
Fixes breakage from HwAccelerationTest This reverts commit b2847afde24aac22c8fb804cdce0c24b8a7c40c4. Change-Id: I762b3c9020fc1d06bac61ffa8b956049147515b1