This reverts commit 8b5af2c1. Reason for revert: Fix capture of image files. Bug: 128529256 Change-Id: I55e7ee178695358d5f3e19c0d0641bcaaa3fe355 Test: m test-art-host