Merge "fix [2835280] Add support for cancelling buffers to ANativeWindow" into gingerbread