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

Change-Id: I99f9b22c0ca9a7560f3b183a925575609fca3019