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

Change-Id: I44d7f54d46628de1dc5bbe4d5bd681cfde434f23