Merge commit '288cb24be01d065843a2a98ed6c0fdbb5faa8268' into eclair-mr2-plus-aosp * commit '288cb24be01d065843a2a98ed6c0fdbb5faa8268': gralloc-qsd8k: If using gpu composition, request rgba8888 instead of rgbx8888