Merge "Use gralloc usage conversion library" into oc-dev