Merge "[ANativeWindow] allocateBuffers changes"