Snap for 4739962 from 987d1e472015692fdd2eb6dc19a52888e5c61ef7 to pi-release

Change-Id: Ia82d442aaf66df9063541b8bd616f42f1f478c7d
diff --git a/driver/rsdAllocation.cpp b/driver/rsdAllocation.cpp
index 6b59d1c..ad926a8 100644
--- a/driver/rsdAllocation.cpp
+++ b/driver/rsdAllocation.cpp
@@ -764,6 +764,15 @@
             return;
         }
 
+        if (alloc->mHal.state.usageFlags & RS_ALLOCATION_USAGE_SCRIPT) {
+            r = ANativeWindow_setUsage(nw,
+                    AHARDWAREBUFFER_USAGE_CPU_READ_RARELY | AHARDWAREBUFFER_USAGE_CPU_WRITE_OFTEN);
+            if (r) {
+                rsc->setError(RS_ERROR_DRIVER, "Error setting IO output buffer usage.");
+                return;
+            }
+        }
+
         IoGetBuffer(rsc, alloc, nw);
         drv->wndSurface = nw;
     }