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

Change-Id: I54219ad459b59ecd923814cf4ae7ea42dc6145c8