Merge "Use the HWC caching mechanism to avoid stalls in the ion driver." into oc-mr1-dev am: 17209ec9e2
am: 3819afa484

Change-Id: I397bf44d0979e62f90b543dfd6ac93375a7d7d09