am 2f19f56a: Merge "Updade Surface (ANativeWindow) format based on its buffers format" into gingerbread