Merge "Add gralloc usage conversion functions" into oc-dev
am: df937b8255

Change-Id: I6c2c1258f55a6d7bc0fc9956a1baa61bd1ac1343