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

Change-Id: I0c21e06d8beb480171b462068d2747c538bca238