Merge "Use the HWC caching mechanism to avoid stalls in the ion driver." into oc-mr1-dev