Merge "Revert "Cache NATIVE_WINDOW_MAX_BUFFER_COUNT in Surface""