gralloc960: Clean up previous ion api rework
am: 7357dcd8b3

Change-Id: I569f73615ee2c0354a73a88db73393913c054703