Merge commit '79c9ceea6ec3ac708ec7e27ab3af54ffdaf9338f' * commit '79c9ceea6ec3ac708ec7e27ab3af54ffdaf9338f': make gralloc-qsd8k closer to the generic gralloc so it's easier to maintain