Merge commit '4842a5eaee0b93950297f52dd1ce56d13f7628eb' * commit '4842a5eaee0b93950297f52dd1ce56d13f7628eb': gralloc-qsd8k: Change composition_complete being a glfinish from stopship to a TODO