Merge "Use gralloc usage conversion library" into oc-dev
am: 2f44ec6c86

Change-Id: I692ea8e24c0d87e7729e52c1e35d7d40eab12a0f